bitkeeper revision 1.1159.1.123 (41384dfcdRnIRMBS8UnlM1FaR2oMpw)

Don't output warning messages when using a linear pagetable mapping.

diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c
index 3dfa8b3460e29f92228e02ed67c9a01f153715fe..a8223dab86966340624b7568b8b4f69f661a10f2 100644 (file)
--- a/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@ -309,8 +309,11 @@ static int get_page_and_type_from_pagenr(unsigned long page_nr,
 
     if ( unlikely(!get_page_type(page, type)) )
     {
-        MEM_LOG("Bad page type for pfn %08lx (%08x)", 
-                page_nr, page->u.inuse.type_info);
+#ifdef VERBOSE
+       if (type != PGT_l1_page_table)
+           MEM_LOG("Bad page type for pfn %08lx (%08x)", 
+                   page_nr, page->u.inuse.type_info);
+#endif
         put_page(page);
         return 0;
     }

diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index 7bbe5fe06dce38c43c4c4a0327179db018f77528..147b5a6c71fb3d1e384dd4cbb170d608dcb12c05 100644 (file)
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -228,8 +228,12 @@ static inline int get_page_type(struct pfn_info *page, u32 type)
         }
         else if ( unlikely((x & PGT_type_mask) != type) )
         {
-            DPRINTK("Unexpected type (saw %08x != exp %08x) for pfn %08lx\n",
-                    x & PGT_type_mask, type, page_to_pfn(page));
+#ifdef VERBOSE
+           if ((x & PGT_type_mask) != PGT_l2_page_table &&
+               type != PGT_l1_page_table)
+               DPRINTK("Unexpected type (saw %08x != exp %08x) for pfn %08lx\n",
+                       x & PGT_type_mask, type, page_to_pfn(page));
+#endif
             return 0;
         }
         else if ( unlikely(!(x & PGT_validated)) )